From 3b382c73935f95f927f6a8b4050d6cca1c2b8054 Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Fri, 7 Feb 2020 15:26:56 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 466688 -> 466828 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index eb8bf26f946..81d09e48da7 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -86,6 +86,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 87a42547d52d2e8399c44a92e00bf764ccc02f8d..78d9a040b86dff6d24cfac0011b6e36232e813d3 100644 GIT binary patch delta 168 zcmZqJC)2ZErlEzgg{g(Pg=GutzlZgiX$mE&#U%>56$<*L#YOr_nR)st1=;DkNu`-N zDQP*0>BZIxB^jxCTnZ52;TYuN>KE@E5a8zH=pJmFfTmhOS2sPiL;)tRU}UGCl3J#p mSDKTPz?GKC<>(wA9O@Jtq5(FD3t>|G?}x10e?MenwFLkOFF2S0 delta 29 lcmeC#FVnD3rlEzgg{g(Pg=GutzlZHzk65>NJz`_B1pv7(3{(IB diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d41c40123bc..29d78aafff5 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -251,6 +251,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2